From e2b6044c1bab21510119d4f63ce6032333f5515a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Sat, 22 Oct 2016 19:36:58 +0200
Subject: [PATCH] expander: Remove spacing property

---
 docs/reference/gtk/gtk4-sections.txt |  2 -
 gtk/gtkexpander.c                    | 75 ----------------------------
 gtk/gtkexpander.h                    |  7 ---
 3 files changed, 84 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 8eb948b3f1..7a36a2d488 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1216,8 +1216,6 @@ gtk_expander_new
 gtk_expander_new_with_mnemonic
 gtk_expander_set_expanded
 gtk_expander_get_expanded
-gtk_expander_set_spacing
-gtk_expander_get_spacing
 gtk_expander_set_label
 gtk_expander_get_label
 gtk_expander_set_use_underline
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index dcbbb101aa..2b6c985950 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -137,7 +137,6 @@ enum
   PROP_LABEL,
   PROP_USE_UNDERLINE,
   PROP_USE_MARKUP,
-  PROP_SPACING,
   PROP_LABEL_WIDGET,
   PROP_LABEL_FILL,
   PROP_RESIZE_TOPLEVEL
@@ -312,25 +311,6 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                          FALSE,
                                                          GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY));
 
-  /**
-   * GtkExpander:spacing:
-   *
-   * Space to put between the label and the child when the
-   * expander is expanded.
-   *
-   * Deprecated: 3.20: This property is deprecated and ignored.
-   *     Use margins on the child instead.
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_SPACING,
-                                   g_param_spec_int ("spacing",
-                                                     P_("Spacing"),
-                                                     P_("Space to put between the label and the child"),
-                                                     0,
-                                                     G_MAXINT,
-                                                     0,
-                                                     GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED));
-
   g_object_class_install_property (gobject_class,
                                    PROP_LABEL_WIDGET,
                                    g_param_spec_object ("label-widget",
@@ -474,9 +454,6 @@ gtk_expander_set_property (GObject      *object,
     case PROP_USE_MARKUP:
       gtk_expander_set_use_markup (expander, g_value_get_boolean (value));
       break;
-    case PROP_SPACING:
-      gtk_expander_set_spacing (expander, g_value_get_int (value));
-      break;
     case PROP_LABEL_WIDGET:
       gtk_expander_set_label_widget (expander, g_value_get_object (value));
       break;
@@ -515,9 +492,6 @@ gtk_expander_get_property (GObject    *object,
     case PROP_USE_MARKUP:
       g_value_set_boolean (value, priv->use_markup);
       break;
-    case PROP_SPACING:
-      g_value_set_int (value, priv->spacing);
-      break;
     case PROP_LABEL_WIDGET:
       g_value_set_object (value,
                           priv->label_widget ?
@@ -1233,55 +1207,6 @@ gtk_expander_get_expanded (GtkExpander *expander)
   return expander->priv->expanded;
 }
 
-/**
- * gtk_expander_set_spacing:
- * @expander: a #GtkExpander
- * @spacing: distance between the expander and child in pixels
- *
- * Sets the spacing field of @expander, which is the number of
- * pixels to place between expander and the child.
- *
- * Since: 2.4
- *
- * Deprecated: 3.20: Use margins on the child instead.
- */
-void
-gtk_expander_set_spacing (GtkExpander *expander,
-                          gint         spacing)
-{
-  g_return_if_fail (GTK_IS_EXPANDER (expander));
-  g_return_if_fail (spacing >= 0);
-
-  if (expander->priv->spacing != spacing)
-    {
-      expander->priv->spacing = spacing;
-
-      gtk_widget_queue_resize (GTK_WIDGET (expander));
-
-      g_object_notify (G_OBJECT (expander), "spacing");
-    }
-}
-
-/**
- * gtk_expander_get_spacing:
- * @expander: a #GtkExpander
- *
- * Gets the value set by gtk_expander_set_spacing().
- *
- * Returns: spacing between the expander and child
- *
- * Since: 2.4
- *
- * Deprecated: 3.20: Use margins on the child instead.
- */
-gint
-gtk_expander_get_spacing (GtkExpander *expander)
-{
-  g_return_val_if_fail (GTK_IS_EXPANDER (expander), 0);
-
-  return expander->priv->spacing;
-}
-
 /**
  * gtk_expander_set_label:
  * @expander: a #GtkExpander
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index 085c4480e3..69a3fec3ff 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -87,13 +87,6 @@ void                  gtk_expander_set_expanded        (GtkExpander *expander,
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_expander_get_expanded        (GtkExpander *expander);
 
-/* Spacing between the expander/label and the child */
-GDK_AVAILABLE_IN_ALL
-void                  gtk_expander_set_spacing         (GtkExpander *expander,
-                                                        gint         spacing);
-GDK_AVAILABLE_IN_ALL
-gint                  gtk_expander_get_spacing         (GtkExpander *expander);
-
 GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_label           (GtkExpander *expander,
                                                         const gchar *label);
-- 
2.30.2